Fixed UI display bugs
